bitkeeper revision 1.1236.1.120 (4241b2ebBzxqlRsKYsrNIy3_dpl_oA)

Remove DOM0_IOPL_PERMISSION since it doesn't make much sense.
All admin checks go throu the bitmap mask. Even privileged domains
(inc. domain0) must have a mask.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c
index 4ffecb3883c9ca314710e7c0943779a038b58c50..27074f1cc841c23e75e2b372fde3ff38e400cc2c 100644 (file)
--- a/xen/arch/x86/dom0_ops.c
+++ b/xen/arch/x86/dom0_ops.c
@@ -136,26 +136,6 @@ long arch_do_dom0_op(dom0_op_t *op, dom0_op_t *u_dom0_op)
     }
     break;
 
-    case DOM0_IOPL_PERMISSION:
-    {
-        struct domain *d;
-
-        ret = -EINVAL;
-        if ( op->u.iopl_permission.max_iopl > 3 )
-            break;
-
-        ret = -ESRCH;
-        if ( unlikely((d = find_domain_by_id(
-            op->u.iopl_permission.domain)) == NULL) )
-            break;
-
-        ret = 0;
-        d->arch.max_iopl = op->u.iopl_permission.max_iopl;
-
-        put_domain(d);
-    }
-    break;
-
     case DOM0_IOPORT_PERMISSION:
     {
         struct domain *d;

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index f06e9991edb33a21238766dc28b65942ec852292..3304d96df583f715a247803e3f3ac4da1a1c15d5 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -417,9 +417,6 @@ static inline int admin_io_okay(
     struct domain *d = ed->domain;
     u16 x;
 
-    if ( IS_PRIV(d) || (d->arch.max_iopl >= (KERNEL_MODE(ed, regs) ? 1 : 3)) )
-        return 1;
-
     if ( d->arch.iobmp_mask != NULL )
     {
         x = *(u16 *)(d->arch.iobmp_mask + (port >> 3));

diff --git a/xen/common/physdev.c b/xen/common/physdev.c
index 64319b5aabf602367cdfe49ef863b5e9168bd2a3..652c9c2afe70e32109cb99703b59dd502aa42e43 100644 (file)
--- a/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@ -744,13 +744,17 @@ static int pcidev_dom0_hidden(struct pci_dev *dev)
 
 
 /* Domain 0 has read access to all devices. */
-void physdev_init_dom0(struct domain *p)
+void physdev_init_dom0(struct domain *d)
 {
     struct pci_dev *dev;
     phys_dev_t *pdev;
 
-    INFO("Give DOM0 read access to all PCI devices\n");
+    /* Access to all I/O ports. */
+    d->arch.iobmp_mask = xmalloc_array(u8, IOBMP_BYTES);
+    BUG_ON(d->arch.iobmp_mask == NULL);
+    memset(d->arch.iobmp_mask, 0, IOBMP_BYTES);
 
+    /* Access to all PCI devices. */
     pci_for_each_dev(dev)
     {
         if ( pcidev_dom0_hidden(dev) )
@@ -759,20 +763,17 @@ void physdev_init_dom0(struct domain *p)
             continue;
         }
 
-
-        if ( (pdev = xmalloc(phys_dev_t)) == NULL ) {
-            INFO("failed to allocate physical device structure!\n");
-            break;
-        }
+        pdev = xmalloc(phys_dev_t);
+        BUG_ON(pdev == NULL);
 
         pdev->dev = dev;
         pdev->flags = ACC_WRITE;
         pdev->state = 0;
-        pdev->owner = p;
-        list_add(&pdev->node, &p->pcidev_list);
+        pdev->owner = d;
+        list_add(&pdev->node, &d->pcidev_list);
     }
 
-    set_bit(DF_PHYSDEV, &p->d_flags);
+    set_bit(DF_PHYSDEV, &d->d_flags);
 }
 
 

diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index b8838216cbcec92b32bb656658ac2ffef2174fd4..9150033be865a9f19c767993ea8cc0eae920a2f4 100644 (file)
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -20,7 +20,6 @@ struct arch_domain
 
     /* I/O-port access bitmap mask. */
     u8 *iobmp_mask;       /* Address of IO bitmap mask, or NULL.      */
-    int max_iopl;         /* Maximum achievable IOPL. */
 
     /* shadow mode status and controls */
     unsigned int shadow_mode;  /* flags to control shadow table operation */

diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h
index ab1d6dc8543460a6ad70be645e2ad5e6f7ecfb4c..979b083b55188ab7e3aad7e97bc35238f7023c2a 100644 (file)
--- a/xen/include/public/dom0_ops.h
+++ b/xen/include/public/dom0_ops.h
@@ -407,13 +407,7 @@ typedef struct {
     u32     _pad0;
 } PACKED dom0_microcode_t; /* 16 bytes */
 
-#define DOM0_IOPL_PERMISSION     36
-typedef struct {
-    domid_t domain;                   /* 0: domain to be affected */
-    u16     max_iopl;                 /* 2: new effective IOPL limit */
-} PACKED dom0_iopl_permission_t; /* 4 bytes */
-
-#define DOM0_IOPORT_PERMISSION   37
+#define DOM0_IOPORT_PERMISSION   36
 typedef struct {
     domid_t domain;                   /* 0: domain to be affected */
     u16     first_port;               /* 2: first port int range */
@@ -455,7 +449,6 @@ typedef struct {
         dom0_read_memtype_t      read_memtype;
         dom0_perfccontrol_t      perfccontrol;
         dom0_microcode_t         microcode;
-        dom0_iopl_permission_t   iopl_permission;
         dom0_ioport_permission_t ioport_permission;
     } PACKED u;
 } PACKED dom0_op_t; /* 80 bytes */